Merge branch 'master' of https://bitbucket.org/ggj16camden/ggj16-game

Conflicts:
	Assets/Scripts/Player.cs
